From 2eec925b2d1fbaee811c60b3f2f31ca2d376a4d2 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Thu, 9 Jan 2014 11:49:05 -0500
Subject: [PATCH] Remove stray conflicty markar that the VCS somehow ignored.

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a02fd5cdb0..e75215de128 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 2014-01-09  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc/vc-git.el (vc-git-print-log): Add --follow option to command,
-- 
2.30.2